Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 11 May 2010 12:54:50 +0000 (12:54 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 11 May 2010 12:54:50 +0000 (12:54 +0000)
commita47a15c220a7e7ca1d87655640e53e81375fa9a5
treec9cd24062b17eabb7e302f143bf050b24fc2603a
parent1c7b814b2e8ed5f470f3799edbd7572932fb77d2
parent46624500056d26cd22150cd2647de6042fee708c
Merge from mainline.